added code to handle more special namespaces