First version of DiMArch support