Refactored mass-assignment functions