0.58.0 - Optimize insertStrategy class