Updated for 0.44