Second update to Schema-Evolution per comments.