Added '*' expression
Added '%' expression