Enhance rights resolving