Added proper namespace support

UCC git Repository :: git.ucc.asn.au