Fix/mc 21 - custom entity support

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Phpspec specification passes: yes
Checkstyle issues: no
ChangeLog updated: yes
Fixes the following issue: MC-21