Improved mapper. Added Puzzle.setPieces method.