Consolidate ZDefinitions to avoid code duplication