Storage path should not be hardcoded