[AESH-249]
updated to use Resource