added support for Dynamic Type