Add utility code and identify sector struct