JARVIS-313 Refactor