Now storing data in singleton class, no caching of data used anymore