WFK2-705 - replaced deprecated classes