Conversion to Role based auth