Change singleton to instance.