Adapted the examples according the specs changes