Added TODO for fields needed on store save