Adding code for keyword lists