Added new building functionality