Logging fix
Domain refactoring