DEVIDM-80: Logging changes, some refactoring..