Added more generic date handler.