Improved operator overloads