More logging
Refactoring
Fixed produces annotation