Updated Adapter from AdapterResurrection