refactoring:changed ad to apartment /n +added some extra fields