Add outputfields, a timeout and configurable host