Some tweaks
Removed the Role entity implementation and tidied up a bit more