Updated namespace and methods