More complete operator overloading