Replaced examples for something more generic
Handle new field naming convention