Update API doc and add TODOs into code