Improved zk connect generation.