Correct handling of xmark in mark module, connmark module also introduced