Adding in a few classes from domain tracker.
Removing unneeded use statement