Are you able to use the registry instead of duplicating the checks?