source model changes and validation