EZP-22465: update main Legacy Storage handler and factory