Added support for dedicated type layer