Refactor imports in builder