Jira River fully integrated but refactor needed