Removed AdapterView, added Adapter class