Add support for clock offset