DEVIDM-118: Working on scoping.