Feature/storage path