Add better support for mapping collections of different types