Useless check
Fix lib dependency
Refactored outputs