Adding object model abstractions and hierarchy changes