Further struct conversion to Javolution