Updated to version 2.x for Biscuit 2.1