Updated for v1.4beta-4