Some changes on singleton