Added extra Entity classes.