Added negation and key overrides