decoupled from SCM plugin a bit