moved to Metaphor namespace; added namespaces support