JARVIS-338 Refactor