Removed 3 classes from wrapper to comply with latest eq operator changes