Adapted interactive mode to work with new calling convention.