Improve stability
Improve performance for oex version