Add mass assign support