Updated regarding recent AT repository changes