Updated build framework