Add support for "now"