Added first version of suggestion support