Changes on singleton