Add comments of Entity & ConfigureTool