Improve building generation