Added imageClass and renamed imageHandler to imageTagHandler.