General additions. Refactored build creation.