Removed unnecessary distinction between Storage and Headquarter