Changes to allow setting storage (but not working)
stupid error on data fetching
fix module option setting loading error