Fix add
Enhance logs
Enhance logs