Added entityID

Resolves #27