Implemented more fine-grained authentication for services