Add builder pattern for model classes