Resolve #13 and increase the amount of buildings per request