adding support for all buildings