Added groups service and hierarchical lib