Migration and schema updated to fix pending migration issue