Added date support
Removed fixtures