Update to DateSerializer and new LocaleSerializer