Removed the need to go through ISolution nodes for some conversions