Make stuff easier and fix bug with entity path creation