Improved functionality