further improvement for userbility and optimized for uniserver