Refactor Extension ID