Improve raw expressions on model classes