Add more basic stub classes