Added namespace
Removed deprecated method call