Updated for 0.6.0 version