Moving to standalone exports for extension