added missing classes from previous commit