Add support to namespaces and flexible structure tag