Add support for days