Upgrade to Fields 0.6.0