Added more granular ACL checks