added architecture classes