Add Apartment class and improve Account