Changed role

Added logic to make use of the seperate users and role database instead
of only using users