Reorganized Path annotations
Single and Batch evaluation modes