Improved Building Functionality