Update singleton and init constructor