Updated interfaces, some more DB code