Improvements on Generic List Adapter