added missing classes from last commit