Add --enumerate support