Support suffix option