Update to stdmod layout