Adding missing module (Issue #674 and Issue #747)