Add admin role, slight refactor and minor changes on dependencies