TASK: Exchange legacy classes