Added nice-to-have TODOs