Added support for where clauses based on Enum