Adapted the examples according to the specs changes.