Moving date storage to new api