Models & Controllers

Changes on models and controllers