Add support for 2.5 embeddables