Fixes #5: Intermediate entity implemented