Adding support for permissions