Update economy helper
Added CachedQuery and DataState