First cut - Changes to use Spring JDBC APIs