Added collection / map encoding.