Enhanced to pass access control settings.