Add support for --suffix option