Updating the whole code to the current 5.12 version with EJB 3