Architecture related classes added.