Added extra features to test different field configs.