Port to JME and update structure