fix to accept other fields that are on the model directly