Bug fix
Enhance Lazy strategy
Cleanup