Updated classes to reflect latest design for phase 1.