Simplifying parsing

New annotation file format for testing