Now includes permissions support