Added proper iterator conversions