Add Entity Interface
Addressed @romainneutron comments