Move factory in Builder