Added abstract operator support