Added basic operator support