Feature/type clarification

Integrated entity counting, Issue #137