Updated for build 0.5.11