Support schemas more accurately based on serialisation

See merge request !375
3 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds