Add support for tick