Running on Glassfish 4 now