Added pre-0.28 classes