Use proper permissions checking