ROBE-116 Refactor