Updated to match release v0.5-beta