Add TODO for better modularity