Added "z_" prefix to distinguish from default libraries.
Added two dirty connectors - should be redrawn.