refactor class to avoid ns collision with rjc