Add support for date question