#2,#4 Adding additional comparison operator support