Added support for DS-only extensions