Updated migrations to work with new system(broken)