Added TODOs for the complete API