Added contextual argument overrides