Merge of some DB code