Enriching Conceptual Modeling of XML-Aware Adaptive Web Systems with Object-Oriented Constructs and UML Diagrams