Added the original classes, without the cluttering functions.