Feature/full operator set