Add access scope logic