fixup! Implement new schemas to clive