Common module updates