Updated for v.0.5.0