added support for format suffixes