Refactored building ID lists.