Fixed reference lookups
Fixed reference lookup
Set DatabaseHelper sourceAwareDataSource