Add options.servers, use target, implement port