moved extension specific logic back to the extension