[AESH-135][AESH-136]
updated to work with api changes