Moved variables into appropriate data bags.