Added namespace to libraries