Merge with Alex added db to db+_content