Add a TODO to get rid of code duplication