Changes to add Common.Logging package