add multiple building support