Added further building features