Hossam migration

@sshihata  please merge my migrations