Dropping the builder version to fix circular dependency