Added a real concept retriever (from raw text) and a tokenizer which keeps names