Feature/make reporter stateless