Adds missing classes from previous commit