Use separated fields for Date. Fixes #40