Update date collector to use longs instead of strings