Work on ESAP-DB: