Improved handling for NEXUS block tokens