Added namespace draft