Refactored updates for Systems