Fix/basic entity extract interface