[na] refactiry in access control