Updated builder for searching mapper if not passed to constructor