Added sample handler