History done + design modification for moduleManager