Add support for default_operator