Updated to use field set class.