Refactored controllers methods
Apartment entity added