Expose fieldcount and update wrappers