Add support for 2.5 embeddables

Sorry about creating a new PR but i didn't manage to get it working properly, but this should work fine :)