Updated Apartments Modules