WIP: improved schemas