Update init. Change initialization logic