Construction fixed
JDBCSource refactored -> delegation over inheritance