Suffix option added