Add basic extra modules
fix versions
Reset back to original status