Updated with jboss datasource