Added controllers plus models logic