Improved analysis of building type.