Should we be using the class/instance here for consistency with ciphers?