Improve some feature