Improve user scripts