Added partial support for running interactively