More work on schema modularisation