fixing missing classes from last commit