Tweaked Fluent interface and implemented FindByCriteria.