Refactoring, added jar