Make it work for some more entities