Adapted to custom repo