Changed singletons to from pointers to references