Add support for default values when building a singular model