Fix missing entities

closes #8