Merge new classes from upstream