Started adding support for building different structures