Added building fetching