Changes to make use of Spring JDBC APIs