Adding Empty class and switching some Nones to it where required by specification Some additions to CipherState