adapt to new sarasa core