Moved variables to inventory files