Add the gap time support