More work in embed & Cors