Fix selector operand relation checking
Fix the addKey method improperly checking if the key already exists
Organize imports
Fix the mirrorStorage method improperly checking unit-mapping existence
Fix invalid parameter type in the unmirrorStorage method definition