added support for additional namespaced elements

cleanup