Company context now persists across modules

General