Refactored to support adding htmal statement and new classification.