Refactored paths to improve watch performance