Can you make the connection options pre-defined instead of a map to reduce the issue of passing non exisiting parametres ?