Final Fix for Annotations Parser