Updated for v1.2+