Fixed for Autumn schema changes