Added sample mapping