TODO update

Updated scope for v0.3