How about allowing the creation of new buildings to reflect the government and reform building conditionals that are needed for the new units rather than grouping all the units into the one building? After all, a reform would need to take some time to be carried out and the time taken to create a new building may be short to reflect the current infrastructure?
Bookmarks