Refactoring to get a generic mandate