Universal module definition added