Refactoring, --su, --rollback, --s key support