added a jira possibility plus some other refactoring