CoreSystem flow updated