added support for Group lookup