Refactored hardcoded paths