Added support for custom embed and link handlers