Added experimental support for leashed entities, disabled by default