Better access checks handling