List wrapper class instead of GenericListWrapper

Use a new specific List wrapper class instead of GenericListWrapper.