Remove deprecation warning (`s/advance/all`)
fix build
Add an option to override enum type