Update to JEE 6