Refactored building details