Add a bit more documentation and tweak schema