Add much more finegrained access control