Add suggestion support