The overhaul comes into effect from April 1 next year