Added logging, removed namespaces