Add schemas code, second attempt.

That's not the same, I only want the above two cases.