Adding my changes for apelclient and apelparser for EMI3