Added TZ support
Namespaces removed from sample applications