Update to ESDL 0.4.x