Improve access checks