Added additional source information and a note about correctly setting up the handler mapping