Add TODO for creating new function to gather unifomr update