To track the various custom handler changes done. Open for the moment.