Adding more stub classes