Making models more flexible: OQueryModel and SimpleNamingModel