Modified AndroidDector class and UEInfo class