Add logging and change subscribtion method call