Added mapper and getCount