Added namespace to handler