Updated operator overloads