Source model minor refactoring