Improved utilities