Build definition refactored