Fixing up the helper classes for migration