Pascal Engélibert
--- a/pallets/universal-dividend/src/lib.rs
+++ b/pallets/universal-dividend/src/lib.rs
    // GENESIS

    #[pallet::genesis_config]
-    pub struct GenesisConfig<T: Config> {
-        pub first_reeval: T::BlockNumber,
-        pub first_ud: BalanceOf<T>,
+    pub struct GenesisConfig<T: Config>
+    where
+        <T as pallet_timestamp::Config>::Moment: MaybeSerializeDeserialize,
+    {
+        /// If None, it will be set to one period after the first block with a timestamp
+        pub first_reeval: Option<T::Moment>,
+        /// If None, it will be set to one period after the first block with a timestamp
+        pub first_ud: Option<T::Moment>,