Used comment criteria instead of different repositories