Added TODOs for future development/refactoring (backward-incompatible).