better using namespaces
enhanced debug logging