Removed NWVars limit, KeyType stub