Modify and add helpers
Modify and add helpers