Update migrations file
Fix issue #2 and issue #5