Chore/fine grained access control