Refactored path to store data