Added todo for clarifications