Added todo list in core file