Small modifications on the Year store due to service output changes