Data structure adjustment

for notification form reload