Changed field types to new model