Changing collection to not hard code the model type