Optimized references
Version bumped