Ready for class-based units implementation.