Better extension mgmt logic