More modular update