In progress: custom entities (#323).