Make Event logging optional