Conversion to Java EE