Added logging changes for swlib