Added support for lookups by class, scope and visibility