Changes in the base Adapter and Holder