Fixes #333
Used constants for scope claims