Added more building stuff