Added libraries to support v2.1.6