Improved some features