Adding more strucure and key words.