Updated for v2.1 release