Fixed Aesh API changes