Improve functionality