Add host and port options as well