Add date parsing, remove backwards compatibility