Modify before patch
Add time support