Updated to work with the new JWx implementation