Added entity + Elemental classes.