Add bulk support to mapper