fixed the mapping issue with the domain model, every thing works fine
for now.