Added more info functionality