Incremental updates to remove hardcoded values.