Added todo comment in core.py