Added admin_or_self helper and checks