Added a few Field checks and updated an use case.