Fixed to Work With the New REScala Structure