Merged JDBC and DataSource step into one