Added support for simple operations, but no groups or or