Added multiple building support