Use find instead of fetch in mappers