refactor lookup for subclass