Updated to remove references to old classes