Updated namespace and added comments