Moved into build