Added missing classes from last commit (oops!)