adapt to jski and cores changes