adding some modules to prepare for pipeline integration