Deprecate old builder and add new ones