Added op module, disabled by default