Added phase 2 classes