add partial support for buildings