Mass assignment method + unpack rename
Refactoring + todo