Make use of observer and improve MVC seperation