Keywords logic updated