Add suffixes support + cleanup debug