updated data model
contacts substitution