Improved some singleton management