Added building requirements handling