Issue 547 - Refactor proxy registration