Add support for time