Adding missing classes from previous commit