Adds back in old classes for compatibility.