Implemented new module members (see issue #40)