Adding some fixes and the ResourceHandler new method to find a group from a given resource