Change default lookup and add another query method