Improved custom field consistency
v0.9.6 -- version bump