Add more abstract classes