Added todo for the next features