Added in singleton to hold data