Changes to logging system