Minor reorganization
Enable encryption of data partition