#291 More work on db backend