Macro Enhancement

Enhanced macro to support the followings operator: 

-startsWith
-endsWith
-contains
-eq
-ne
-isEmpty