JARVIS-338 Refactoring