Add support for checking time