Raza refactor