Move lookups to trait