Additional classes and enhancements