DataBase adaptation
imports fixes