Added initial support for grouping location buildings together