Added option to include-glyph-buildings
Updated to work with current lib