Added updates to allow logging to work