Improve some features