Improved utils