Adding some modules from old pipeline