Add in singleton class for data access