added --exec support