Upgraded build pack utils