master : Fix Namespace and other issues