Added proper class and text generation