Add UALogger
Refactoring