Add support for built-in widgets