Data types and main part of storage change