[AESH-249]
updated to work with latest api changes