Extended with extra classes