More schema

Old pull request got lost.