New core-db changes