Add TODO to check the keyword preservation