CON-1075 | Refactoring