Updated for compatibility with agg-cat