Correct mapping to support full field type path