removed storage package and refactored LoadDefinition