Module entity API updated. refs #2732