Add full support for Dynamic Type