Add Uoid to FieldType. Refactor buiding of where clause.