Fixed the other two abstract classes