Tried to solve coding errors.
Merge branch 'migration'