Structured samples, added some more complex scenarios