Improve access control