TODO update for versions 0.3.0 and 0.4.0