Fixed externalized Parser migration issues