Added new labels and columns for Issue #33