Modify the annotation parsing code to cope with the schema changes