Updated for pre-release 0.5b1