Feature/more decoupling finally ready