SM: extend simulator handling