Adds support for namespace options