Added abstract classes