Support value overrides
3 files changed