To be tagged as 0.6.0