UPDATED: Worked on JDBC NR