Added map and filter.