Added support for suggestions