Added support for suffixes