Improved path definitions