Changed to adapt to Oracle and Wildfly