Updated for 0.2.7