Added namespace
Added more functionality