Changes scope to include instance, configuration and default

Solves bug 3499