Updating criteria types to match new documentation
Improved the fluent interface in criteria builder