Added support for bundle suffix