API-55 Refactor to manage the external and web register