Refactor DelaySI entries