Issue 200 schema refinements

[SetroZ]

Change Summary

[Briefly summarise the changes that you made. Just high-level stuff]

Change Form

Fill this up (NA if not available). If a certain criteria is not met, can you please give a reason.

• [x] The pull request title has an issue number
• [x] The change works by "Smoke testing" or quick testing
• [x] The change has tests
• [x] The change has documentation

[dct0]

Looks all good, but will wait on approving until a few other prs are merged first