Applied Aesh API changes