Dev database

@ahmedhagii @AhmedElassuty 

Fixing relation