Allow adding custom context. Closes #3