New Model and Repository organization