updated ingester to use domain objects