add ReturnNode check and CoreFeatures