make smart mapper smarter