Update Adapter to 2.1.1