Changes for EJDB