Enhancement: Added backward compatible iterator class