Trying to fix Annotations Parser