Data type changes in DataSource.java, small code cleanup, and removal of redundant setters