Fix entities in client code.

Fix #30