Migration for Issue 46