[#68382170] Refactored to accommodate for all domains

Signed-off-by: Seth Musulin <sethmusulin@gmail.com>