Add date type
moving around some imports