EZP-22105: refactored dependencies