merge session registry and controller