Add ToDo remark about S5 and KB