Updated for v2.1.0 milestone