Add small additions and new 'type' field to building list