Added entityshapes