Modified to use Spring JDBC