Moved build to external