More flexible and logical suggestion handling and storage