Added robust repository control