Changed how the fields are added to allow more control over what happens during content creation.