Add EntityCondition parsing