Updated to work with new JME