Fix/get back building structure