Working through more scenarios - multiple versions, schema filter etc.