Adapt for ESDL lib