Thanks to Roland Gruber for the schema contribution.
Closes #872 (closed)
This will create a new commit in order to revert the existing changes.