Add debug messages back in for new key types