GH #244 - Added long and Arrow to mapper's types.