[#23] Add extra context as recommended by @patriot1burke