Added initilization handling