Enhanced logging structure
Fixed conflicts