Started to add admin capabilities