Refactored intent attachment to extension