Updated the starter default data configuration to be more generic.
Updated the model definition to use an actual Model class for consistency.