Add support for more operators