Adds support to no-interaction mode