Merge pull request #87 from sleepingkingstudios/chore/migrate-relatio…

Merge pull request #87 from sleepingkingstudios/chore/migrate-relatio… #462