Refactored Building