migration fixes
step 4 & 5 (magic methods and traits) finished