Renamed these classes...I hate using "Imp" at the end of class names