replace Builder with a custom model