Strategy enum, preparation for change in storage structure