More Field checking
Beginning with Adapter api
More improvements