Add missing schemas

Supersedes #151, #149 and #147