Add TODO to make expression optional