Added generic type to Adapter