Moving out of singleton setup