fix iterating dictionary
fix domain model