More schema juggling