Minor tweaks for resolving logic and adding registration method