Updated more classes for the new changes coming.

Signed-off-by: Dalton Pelc <daltonjpelc@gmail.com>