Improved helpers