Added dynamic loading of groups.