Added namespace and export features