Add TODO to fix additional requires