The goal is to complete the integration with eventtracking in a second PR, correct? That way we don't have to add the context explicitly.