Revert "Removed default claims for nbt and ist"

This reverts commit ff1e55884bef54a6cd46284d4a45f5039b7a9175.