Pull Request: dev_database

@ahmedhagii @AhmedElassuty  check fast important