Added support for extra extensions with Extra namespace