I would leave these classes in the spec, to make sure we're not breaking BC with previous versions.