Added improved operator support