Added geometry on entities