Optimize rsf insert
Adapt new parser