Added support for access control