CON-1359 | Try to separate more