Version 2 of the repository/generic assignment