some changes for db inline.