Improved code paths