fixed to using Poirot Core as Entity