Refactoring + AddCreateDB