Removing hardcoded path