Match model intergrity problem and data inconsistency resolve #25 resolve #26