Missing classes from original codebase