Add conversion from old classes, #240