Added map and filter to List